diff --git a/templates/article.html b/templates/article.html
index 5ae6011..f0b23fe 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -3,15 +3,13 @@
 <meta name="keywords" content="
   {%- if GLOBAL_KEYWORDS -%}
     {{ GLOBAL_KEYWORDS|join(', ') }}
-    {%- if article.tags -%}
-      {{', '}}
-    {%- endif -%}
+    {%- if article.tags -%}{{', '}}{%- endif -%}
   {%- endif -%}
   {{article.tags|join(', ') }}">
 {% endblock %}
 
-{% block title %}{{ article.title }} | {{ SITENAME }}{% endblock %}
-{% block description %}{{ article.title }} | {{ article.content|striptags|truncate(250)|escape }}{% endblock %}
+{% block title %}{{ article.title|striptags|escape }} | {{ SITENAME }}{% endblock %}
+{% block description %}{{ article.title|striptags|escape }} | {{ article.content|striptags|truncate(250)|escape }}{% endblock %}
 
 {% block subheader %}
 <p>Posted
diff --git a/templates/base.html b/templates/base.html
index 94d4231..ce2b4d3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -32,9 +32,7 @@
   <meta name="keywords" content="
     {%- if GLOBAL_KEYWORDS -%}
       {{ GLOBAL_KEYWORDS|join(', ') }}
-      {%- if tags -%}
-        {{', '}}
-      {%- endif -%}
+      {%- if tags -%}{{', '}}{%- endif -%}
     {%- endif -%}
     {{tags|join(', ', attribute='0') }}">
   {% endblock %}
diff --git a/templates/page.html b/templates/page.html
index 4c51299..234e973 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ page.title }} | {{ SITENAME }}{% endblock %}
+{% block title %}{{ page.title|striptags|escape }} | {{ SITENAME }}{% endblock %}
 
 {% block content %}
 <article>